From 11a63013a3b149c57f2f8216c10d69c6b0b0760b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 22 Jul 2014 08:08:55 -0700
Subject: [PATCH] Fix travis builds

---
 .travis.install.deps.sh | 2 +-
 .travis.yml             | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index ff4f5007e..4f3627f3a 100755
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -12,7 +12,7 @@ fi
 if [ "${TRAVIS}" = "true" ] && [ "${target}" = "unknown-linux-gnu" ]; then
     # Install a 32-bit compiler for linux
     sudo apt-get update
-    sudo apt-get install gcc-multilib lib32stdc++6
+    sudo apt-get install g++-multilib lib32stdc++6
 fi
 
 # Install both 64 and 32 bit libraries. Apparently travis barfs if you try to
diff --git a/.travis.yml b/.travis.yml
index 4141358ef..273749079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,8 @@ script:
   - make install DESTDIR=${PWD}/destdir
 
 env:
-  global:
-    - LD_LIBRARY_PATH=/usr/local/lib
-    - DYLD_LIBRARY_PATH=/usr/local/lib
-  matrix:
-    - BITS=32
-    - BITS=64
+  - BITS=32
+  - BITS=64
 
 os:
   - linux
-- 
2.30.2